Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EVENT PR] Brainslugs (Again) #3321

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented May 14, 2023

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Ports Paradise Brainslugs with some major alterations.
/:cl:

tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


Apparently this didn't go through in the last commmit?


 Ported Paradise SS13 Cortical Borers



tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


reproduction levels


icons


icons


Cure


hiding icon


Rebase


Checks


PROC_REF


PROC_REF


515 is lame


UID Temp


Reproduce icon


UID death

Disables Zombie Powder and stun action wheel too
Update ColonialMarinesALPHA.dme

Co-authored-by: harryob <[email protected]>
Lang fix 0.5


Lang fix, property, chem names.


Var tidy and chem cats


Speech, Chem Fix & Enzyme Grinding


Chem log


Spans and Ghost chat


emote freedom


parenthesis


stun fix


Death handling & hud fix


Follow and Death


death check


Player SimpleMobs in Orbit


Enzymes and FOLLOW


Defines, Balance, Brain Damage


Defines and Balancing


Spawn message & Orbit order


Orbit order


X


Impurity Part 1


Luminescence and Icons


Icon Rebase


Hibernation


message types


 Ported Paradise SS13 Cortical Borers



working chems p2


Text SPANs


Moved procs to separate file


 Ported Paradise SS13 Cortical Borers



tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


icons


icons


hiding icon


Rebase


UID Temp


Reproduce icon


UID death

Disables Zombie Powder and stun action wheel too
Update ColonialMarinesALPHA.dme

Co-authored-by: harryob <[email protected]>
Var tidy and chem cats


Speech, Chem Fix & Enzyme Grinding


Spans and Ghost chat


Death handling & hud fix


Follow and Death


Player SimpleMobs in Orbit


Enzymes and FOLLOW


Defines, Balance, Brain Damage


Defines and Balancing


Spawn message & Orbit order


Orbit order


X


Luminescence and Icons


Icon Rebase


515


rebase


ma


antiruntime


carbon


tests
HUD and more modernisation


holder icon


follow and PP fix + Life()

ack!


Minor tweaks and updates

ert name
ladders


x


f


scanner detection
chems and gen1 fix
tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


Apparently this didn't go through in the last commmit?


 Ported Paradise SS13 Cortical Borers



tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


reproduction levels


icons


icons


Cure


hiding icon


Rebase


Checks


PROC_REF


PROC_REF


515 is lame


UID Temp


Reproduce icon


UID death

Disables Zombie Powder and stun action wheel too
Update ColonialMarinesALPHA.dme

Co-authored-by: harryob <[email protected]>
Lang fix 0.5


Lang fix, property, chem names.


Var tidy and chem cats


Speech, Chem Fix & Enzyme Grinding


Chem log


Spans and Ghost chat


emote freedom


parenthesis


stun fix


Death handling & hud fix


Follow and Death


death check


Player SimpleMobs in Orbit


Enzymes and FOLLOW


Defines, Balance, Brain Damage


Defines and Balancing


Spawn message & Orbit order


Orbit order


X


Impurity Part 1


Luminescence and Icons


Icon Rebase


Hibernation


message types


 Ported Paradise SS13 Cortical Borers



working chems p2


Text SPANs


Moved procs to separate file


 Ported Paradise SS13 Cortical Borers



tiny bit of text clean up


Working chems


working chems p2


Text SPANs


Action swap and categories


Moved procs to separate file


icons


icons


hiding icon


Rebase


UID Temp


Reproduce icon


UID death

Disables Zombie Powder and stun action wheel too
Update ColonialMarinesALPHA.dme

Co-authored-by: harryob <[email protected]>
Var tidy and chem cats


Speech, Chem Fix & Enzyme Grinding


Spans and Ghost chat


Death handling & hud fix


Follow and Death


Player SimpleMobs in Orbit


Enzymes and FOLLOW


Defines, Balance, Brain Damage


Defines and Balancing


Spawn message & Orbit order


Orbit order


X


Luminescence and Icons


Icon Rebase


515


rebase


ma


antiruntime


carbon


tests
HUD and more modernisation


holder icon


follow and PP fix + Life()

ack!


Minor tweaks and updates

ert name
ladders


x


f


scanner detection
chems and gen1 fix
@realforest2001 realforest2001 added Do Not Merge If you merge this PR, I will annihilate you Stale Exempt PR can't go stale Admin Make things harder for admins Test Merge Only This PR's purpose is for testmerges only. labels May 14, 2023
@github-actions github-actions bot added Sprites Remove the soul from the game. UI deletes nanoui/html Feature Feature coder badge labels May 14, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label May 23, 2023
@Watermelon914
Copy link
Contributor

Going to close this PR to clear up the tracker.
If you want to re-testmerge this PR, just re-open it and testmerge after fixing conflicts.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 25, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 25, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Do Not Merge If you merge this PR, I will annihilate you Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code Sprites Remove the soul from the game. Stale Exempt PR can't go stale Test Merge Only This PR's purpose is for testmerges only. UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants